merge trunk

diff --cc doc/misc/ChangeLog
Simple merge

diff --cc lisp/ChangeLog
index 570c63da1e74c199313cba2cb1eccb8e55c4e552,31a01558190117e20c21b888af2355c2b87b2b49..f751aef6c5fe37763f56af2e437abdfec205f2ac
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,14 -1,13 +1,24 @@@
+ 2010-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * simple.el (blink-paren-function): Move from C to here.
+       (blink-paren-post-self-insert-function): New function.
+       (post-self-insert-hook): Use it.
+ 
+       * emacs-lisp/pcase.el (pcase-split-memq):
+       Fix overenthusiastic optimisation.
+       (pcase-u1): Handle the case of a lambda pred.
+ 
 +2010-08-31  Kenichi Handa  <handa@m17n.org>
 +
 +      * international/mule-cmds.el (standard-display-european-internal):
 +      Setup standard-display-table for 8-bit characters by storing 8-bit
 +      characters in the element vector.
 +
 +      * disp-table.el (standard-display-8bit): Setup
 +      standard-display-table for 8-bit characters by storing 8-bit
 +      characters in the element vector.
 +      (standard-display-european): Likewise.
 +
  2010-08-31  Masatake YAMATO  <yamato@redhat.com>
  
        * textmodes/nroff-mode.el (nroff-view): New command.

diff --cc lisp/simple.el
Simple merge

diff --cc src/ChangeLog
index cfce13c07f77aeba8332c9abe73ec620e237de61,20aaa84c48339e7ff38695826b6a2d8a36138f3e..2b18d156562dae7e63b36d7f4ec978d419e89746
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,33 -1,11 +1,41 @@@
+ 2010-09-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * cmds.c (Vblink_paren_function): Remove.
+       (internal_self_insert): Make it insert N chars at a time.
+       Don't call blink-paren-function.
+       (Fself_insert_command): Adjust accordingly.
+       (syms_of_cmds): Don't declare blink-paren-function.
+ 
 +2010-08-31  Kenichi Handa  <handa@m17n.org>
 +
 +      * dispextern.h (FACE_FOR_CHAR): Use an ASCII face for 8-bit
 +      characters.
 +
 +      * term.c (encode_terminal_code): Fix the previous change.
 +      (produce_glyphs): Don't set it->char_to_display here.  Don't
 +      handle unibyte-display-via-language-environment here.
 +      (produce_special_glyphs): Set temp_it.char_to_display before
 +      calling produce_glyphs.
 +
 +      * xdisp.c (get_next_display_element): Set it->char_to_display
 +      here.  Convert all 8-bit bytes from unibyte buffer/string to 8-bit
 +      characters.
 +      (get_overlay_arrow_glyph_row): Set it.char_to_display too before
 +      calling PRODUCE_GLYPHS.
 +      (append_space_for_newline): Save and store it->char_to_display.
 +      Set it->char_to_display before calling PRODUCE_GLYPHS.
 +      (extend_face_to_end_of_line): Set it->char_to_display before
 +      calling PRODUCE_GLYPHS.
 +      (get_glyph_face_and_encoding): Set the glyph code an 8-bit
 +      character to its byte value.
 +      (get_char_glyph_code): New function.
 +      (produce_stretch_glyph): Set it2.char_to_display too before
 +      calling x_produce_glyphs.
 +      (x_produce_glyphs): Simplify by using the same code for ASCII and
 +      non-ASCII characters.  Don't set it->char_to_display here.  Don't
 +      handle unibyte-display-via-language-environment here. For a
 +      charater of no glyph, use font->space_width instead of FONT_WIDTH.
 +
  2010-08-31  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * keyboard.c (Fwindow_system): Fix compilation for USE_LISP_UNION_TYPE.